Merge branch 'master' into places-sidebar
authorFederico Mena Quintero <federico@gnome.org>
Sun, 21 Apr 2013 22:21:37 +0000 (18:21 -0400)
committerFederico Mena Quintero <federico@gnome.org>
Sun, 21 Apr 2013 22:21:37 +0000 (18:21 -0400)

Trivial merge